Undo misapplied search replace.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c
index 28a18900853ce7e062f25c3b8f40011d8e7600cc..f3bde8d9ba5bebf83a339e10b3e811edbd54f6df 100644 (file)
--- a/xen/arch/x86/hvm/vioapic.c
+++ b/xen/arch/x86/hvm/vioapic.c
@@ -52,7 +52,7 @@ static void ioapic_enable(hvm_vioapic_t *s, uint8_t enable)
         s->flags &= ~IOAPIC_ENABLE_FLAG;
 }
 
-#ifdef hvm_guest_SAVE_RESTORE
+#ifdef HVM_DOMAIN_SAVE_RESTORE
 void ioapic_save(QEMUFile* f, void* opaque)
 {
     printk("no implementation for ioapic_save\n");

diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h
index 23c03422976f7ef4dfb88ffd00cdbcadbe602c19..812f91d76d153b7d8965426edb8e58f57aed4e6f 100644 (file)
--- a/xen/include/asm-x86/hvm/domain.h
+++ b/xen/include/asm-x86/hvm/domain.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ASM_X86_hvm_guest_H__
-#define __ASM_X86_hvm_guest_H__
+#ifndef __ASM_X86_HVM_DOMAIN_H__
+#define __ASM_X86_HVM_DOMAIN_H__
 
 #include <asm/e820.h>
 #include <asm/hvm/vpic.h>
@@ -49,5 +49,5 @@ struct hvm_domain {
     char                   pbuf[HVM_PBUF_SIZE];
 };
 
-#endif /* __ASM_X86_hvm_guest_H__ */
+#endif /* __ASM_X86_HVM_DOMAIN_H__ */
 

diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h
index ff6d56eb87987d29d1fd94a004bb15e63b0f6593..6b72f95e5d8d4bf225d86ff56cc04abb97c8c826 100644 (file)
--- a/xen/include/asm-x86/hvm/vioapic.h
+++ b/xen/include/asm-x86/hvm/vioapic.h
@@ -116,7 +116,7 @@ int hvm_vioapic_add_lapic(struct vlapic *vlapic, struct vcpu *v);
 
 void ioapic_update_EOI(struct domain *d, int vector);
 
-#ifdef hvm_guest_SAVE_RESTORE
+#ifdef HVM_DOMAIN_SAVE_RESTORE
 void ioapic_save(QEMUFile* f, void* opaque);
 int ioapic_load(QEMUFile* f, void* opaque, int version_id);
 #endif